Upgrade to wgpu 28 #22265

ChristopherBiscardi · 2025-12-25T01:07:06Z

Upgrade to wgpu 28

Important

This can't merge until bevyengine/naga_oil#132 does, and the dependency is updated from my fork to the release.

Also requires wgpu 28 in dlss_wgpu: bevyengine/dlss_wgpu#17

Note

This does not enable mesh shaders, and neither does the naga_oil PR. I chose to do an upgrade first, then go back and see about mesh shaders.

Here's a general list of changes and what I did. Commits are grouped by feature except for the last one, which enabled solari when I ran the solari example.

MipmapFilterMode is split from FilterMode

Split MipmapFilterMode from FilterMode improve bevy_ui Direction docs #8314: Split MipmapFilterMode from FilterMode gfx-rs/wgpu#8314

solution: implement From for MipmapFilterMode/ImageFilterMode since the values are the same. The split was because the spec indicates they are different types, even though they have the same values.

Push Constants are now Immediates

Bring immediate api in line with spec gfx-rs/wgpu#8724

immediate_size is a u32 so use that instead of PushConstantRange

Capabilities name changes

[naga] Add capabilities governing binding array types gfx-rs/wgpu#8671

Got new list from https://github.com/gfx-rs/wgpu/blob/trunk/wgpu-core/src/device/mod.rs#L449 and copied it in.

subgroup_{min,max}_size moved from Limits to AdapterInfo

Move subgroup size handling in line with spec gfx-rs/wgpu#8609

Update the limits to have the fields they have now, mirror the logic from the other limits calls.

multiview_mask

Add multiview limits and tests gfx-rs/wgpu#8206

set to None because we don't use it currently. Its vaguely for VR.

error scope is now a guard

docs(CHANGELOG): Update PR link gfx-rs/wgpu#8685

retain guard and then pop() it later

I made one mistake during the PR, thinking set_immediates was going to be the size of the immediates and not the offset. I'd like reviewers to take a look at immediates offset and size sites specifically just in case I missed something.

Here's a bunch of examples running

Known Issues

Note

There are no current known issues. Everything previous has been solved.

enable extensions can not be written in naga oil in a way that allows them to be used in composed modules.

Update: this was fixed by introducing a flag in naga-oil to force shaders to allow ray queries in composed modules when using bevy_solari. This is temporary and will be different in WESL-future.

old explanation

This is blocking solari from working on nvidia (solari runs successfully on macos m1) because it needs `enable wgpu_ray_query;`. Putting the declaration before `#define_import_path` means it gets stripped out (afaict), and putting it after results in

error: expected global declaration, but found a global directive
  ┌─ embedded://bevy_solari/scene/raytracing_scene_bindings.wgsl:3:1
  │
3 │ enable wgpu_ray_query;
  │ ^^^^^^ written after first global declaration
  │
  = expected global declaration, but found a global directive

dlss_wgpu mixes apis which causes panics now.

Previous notes as dlss_wgpu was being fixed here

The wgpu release notes don't mention which PR this was introduced in, only saying:

Using both the wgpu command encoding APIs and CommandEncoder::as_hal_mut on the same encoder will now result in a panic.

It was caused by gfx-rs/wgpu#8373 which claimed to not know of any use cases

With record on finish, the actual ordering on the command buffer is deeply counter intuitive (all as_hal would come first) and I think it additionally was just flat out broken in some ways

https://discord.com/channels/691052431525675048/743663924229963868/1453786307099758683

Possible path forward is using multiple command buffers: https://discord.com/channels/691052431525675048/743663924229963868/1453795633503670415

and use MipmapFilterMode in the right places

and the value is no longer a Vec because it applies to all shader stages.

…longer here

ChristopherBiscardi · 2025-12-25T02:19:49Z

crates/bevy_render/src/renderer/raw_vulkan_init.rs

                flags: instance_descriptor.flags,
                memory_budget_thresholds: instance_descriptor.memory_budget_thresholds,
                backend_options: instance_descriptor.backend_options.clone(),
+                telemetry: None


telemetry seems to be very firefox-oriented, so I've set it to None.

from: gfx-rs/wgpu#8576

ChristopherBiscardi · 2025-12-25T02:20:58Z

crates/bevy_render/src/view/window/mod.rs

-                    name.starts_with("Radeon")
-                        || name.starts_with("AMD")
-                        || name.starts_with("Intel")
+            bevy_tasks::IoTaskPool::get().scope(|scope| {


This is due to enumerate_adapters being async now. Commenting because its probably worth a look for reviewers above the mass of other changes.

Okay, yeah, interesting. We want to revisit this eventually but since it's for Vulkan blocking here should be fine?

github-actions · 2025-12-25T03:12:12Z

Your PR increases Bevy Minimum Supported Rust Version. Please update the rust-version field in the root Cargo.toml file.

andriyDev

LGTM. AFAICT all the immediates are the correct sizes.

tychedelia

didn't closely audit the feature/caps changes but assuming you read the changelog correctly but otherwise lgtm pending full regression passes.

tychedelia · 2026-01-13T03:52:06Z

crates/bevy_render/src/view/window/mod.rs

-                    name.starts_with("Radeon")
-                        || name.starts_with("AMD")
-                        || name.starts_with("Intel")
+            bevy_tasks::IoTaskPool::get().scope(|scope| {


Okay, yeah, interesting. We want to revisit this eventually but since it's for Vulkan blocking here should be fine?

tychedelia · 2026-01-13T03:54:32Z

crates/bevy_render/src/render_resource/pipeline.rs

-    pub push_constant_ranges: Vec<PushConstantRange>,
+    /// The immediate size for this pipeline.
+    /// Supply 0 if the pipeline doesn't use immediates.
+    pub immediate_size: u32,


Wonder if we might just add a parenthetical for search "(also known as push consants)" or something similar.

tychedelia · 2026-01-13T03:57:03Z

crates/bevy_anti_alias/src/dlss/node.rs

        let time_span = diagnostics.time_span(command_encoder, "dlss_super_resolution");

-        dlss_context
+        let dlss_command_buffer = dlss_context


Why is this necessary? I might be missing something

Mixing the wgpu encoding API with the raw encoding API is not longer allowed, so dlss_wgpu needed some changes, and this reflects the new usage.

ChristopherBiscardi · 2026-01-13T04:13:31Z

didn't closely audit the feature/caps changes but assuming you read the changelog correctly

The features/caps changes are an entire file we copied from wgpu, so it should be resistant to small human errors in that way.

superdump · 2026-01-13T08:29:00Z

crates/bevy_anti_alias/Cargo.toml

 tracing = { version = "0.1", default-features = false, features = ["std"] }
-dlss_wgpu = { version = "2", optional = true }
+# dlss_wgpu = { version = "2", optional = true }
+dlss_wgpu = { git = "https://github.com/ChristopherBiscardi/dlss_wgpu.git", branch = "wgpu-28", optional = true }


This needs to land upstream and have a release before we can merge this PR.

superdump · 2026-01-13T09:04:12Z

crates/bevy_render/src/render_resource/pipeline_cache.rs

    };

-    render_device
+    let scope = render_device


Perhaps call this variable error_scope?

superdump · 2026-01-13T10:09:55Z

crates/bevy_render/src/renderer/mod.rs

-            min_subgroup_size: limits
-                .min_subgroup_size
-                .max(constrained_limits.min_subgroup_size),
-            max_subgroup_size: limits
-                .max_subgroup_size
-                .min(constrained_limits.max_subgroup_size),


Just noting in-line for other reviewers that these subgroup limits were moved to adapter info.

crates/bevy_shader/src/shader_cache.rs

superdump · 2026-01-13T10:47:04Z

crates/bevy_shader/Cargo.toml

-naga_oil = { version = "0.20", default-features = false, features = [
+# naga_oil = { version = "0.20", default-features = false, features = [
+#   "test_shader",
+# ] }
+naga_oil = { git = "https://github.com/ChristopherBiscardi/naga_oil.git", branch = "naga-28", default-features = false, features = [
  "test_shader",
 ] }

 [target.'cfg(target_arch = "wasm32")'.dependencies]
-naga_oil = { version = "0.20" }
+# naga_oil = { version = "0.20" }
+naga_oil = { git = "https://github.com/ChristopherBiscardi/naga_oil.git", branch = "naga-28" }


Just noting the git repo dependencies here for visibility as something that needs to be fixed before merging this PR.

superdump

I'm going to approve, but there is one missing wgpu capability (CULL_DISTANCE) and there are git dependencies (naga_oil and dlss_wgpu) that need to be resolved with updates and releases in those crates before merging this.

ChristopherBiscardi · 2026-01-13T21:51:36Z

CULL_DISTANCE is not in Features, so doesn't need to be mapped.

jasmine-nominal · 2026-01-14T18:06:15Z

crates/bevy_anti_alias/src/dlss/node.rs

        time_span.end(command_encoder);
        command_encoder.pop_debug_group();


I think we need to move these to a new command encoder after add_command_buffer.

We basically need 3 command encoders:

Regular bevy encoder, puts start timestamp before dlss, and records the barriers needed before dlss

Dlss encoder

Regular bevy encoder, puts end timestamp after dlss

However I think we'll need some changes to bevy's diagnostics API in order to make this work, as currently it expects you to use the same encoder to start/end a timestamp query iirc.

I can work on this after this PR, but just wanted to note it.

…_query requirements

ChristopherBiscardi added 10 commits December 24, 2025 15:08

bump versions

710b654

implement Froms for MipmapFilterMode and ImageFilterMode

8f9aa8c

and use MipmapFilterMode in the right places

push constants are now immediates

ee743f8

and the value is no longer a Vec because it applies to all shader stages.

push_constant address space is now the immediate address space

d487417

update full feature list for capability detection

75d0a0b

update limits values. Some were moved to adapterinfo and thus are no …

3ee13c6

…longer here

set multiview_mask to none

5dda602

error scope is now a guard

d60c0cd

find_adapter_by_name is now async because enumerate_adapters is async

fcb2e31

enable solari

f76b7f3

alice-i-cecile added this to the 0.19 milestone Dec 25, 2025

ChristopherBiscardi added 4 commits December 24, 2025 17:38

multiview mask in examples

f497164

also use wgpu 28 in dlss_wgpu

fd8d4e5

enumerate_adapters is async; wait for it if necessary on linux

067b4b9

optional telemetry on vulkan

c53d84c

ChristopherBiscardi commented Dec 25, 2025

View reviewed changes

ChristopherBiscardi added 7 commits December 24, 2025 18:21

the all important comma

fe99a1e

and the semicolon

0753f20

meshlet pipelines push constants -> immediates

18c5d68

push constants are now immediates

a9c6f2a

multiview mask in material_shade_nodes

bdacbf0

push constants are now immediates: visibility_buffer_raster_node

3b2b655

more meshlets multiview_mask + push constants

bb5f440

ChristopherBiscardi added 2 commits December 24, 2025 19:12

wgpu 28 requires a minimum of rust 1.92

e222549

multiview_mask for wasm

1789194

ChristopherBiscardi added A-Rendering Drawing game state to the screen S-Needs-Review Needs reviewer attention (from anyone!) to move forward labels Dec 25, 2025

github-project-automation bot added this to Rendering Dec 25, 2025

ChristopherBiscardi added the C-Dependencies A change to the crates that Bevy depends on label Dec 25, 2025

andriyDev approved these changes Dec 25, 2025

View reviewed changes

mockersf mentioned this pull request Dec 25, 2025

Bump the wgpu group with 3 updates #22271

Closed

ChristopherBiscardi added 2 commits January 9, 2026 18:16

bring up to date with dlss-wgpu encoder changes

53db3a5

Merge remote-tracking branch 'upstream' into wgpu-28

2712514

tychedelia approved these changes Jan 13, 2026

View reviewed changes

ChristopherBiscardi added 3 commits January 12, 2026 20:19

more push constants

694270b

mipmapfiltermode

5d3ffe7

cleanup import from merge

cf30512

github-actions bot mentioned this pull request Jan 13, 2026

22265 bevyengine/bevy-example-runner#193

Closed

superdump reviewed Jan 13, 2026

View reviewed changes

crates/bevy_shader/src/shader_cache.rs Show resolved Hide resolved

superdump reviewed Jan 13, 2026

View reviewed changes

superdump approved these changes Jan 13, 2026

View reviewed changes

JMS55 mentioned this pull request Jan 14, 2026

Bump the wgpu group with 3 updates #22275

Closed

jasmine-nominal reviewed Jan 14, 2026

View reviewed changes

ChristopherBiscardi added 2 commits January 14, 2026 14:23

add a flag to enable special support in naga_oil for solaris wgpu_ray…

245be09

…_query requirements

Merge remote-tracking branch 'upstream' into wgpu-28

5ab800e

		time_span.end(command_encoder);
		command_encoder.pop_debug_group();

Uh oh!

Upgrade to wgpu 28 #22265

Are you sure you want to change the base?

Upgrade to wgpu 28 #22265

Conversation

ChristopherBiscardi commented Dec 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

MipmapFilterMode is split from FilterMode

Push Constants are now Immediates

Capabilities name changes

subgroup_{min,max}_size moved from Limits to AdapterInfo

multiview_mask

error scope is now a guard

Known Issues

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Dec 25, 2025

Uh oh!

andriyDev left a comment

Choose a reason for hiding this comment

Uh oh!

tychedelia left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ChristopherBiscardi commented Jan 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

superdump left a comment

Choose a reason for hiding this comment

Uh oh!

ChristopherBiscardi commented Jan 13, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

ChristopherBiscardi commented Dec 25, 2025 •

edited

Loading

tychedelia left a comment •

edited

Loading